Merge.
authoradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Thu, 25 Aug 2005 19:24:48 +0000 (12:24 -0700)
committeradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Thu, 25 Aug 2005 19:24:48 +0000 (12:24 -0700)

Trivial merge